Resolve conflict in run.sh during cherry-pick from experimental branch. (cherry picked from commit 278c72fef6)
278c72fef6