Resolve conflict in run.sh during cherry-pick from experimental branch. (cherry picked from commit278c72fef6) (cherry picked from commitb8e866d60f) (cherry picked from commitff56ecafc4)
Resolve conflict in run.sh during cherry-pick from experimental branch. (cherry picked from commit278c72fef6) (cherry picked from commitb8e866d60f) (cherry picked from commitff56ecafc4)