Merge "Fix exit status of `run` scripts executing more than one test." am: c7ac275a5f
am: 6b470b1a3d

Change-Id: I685818bea121dfcc5b7b1abe63953d3eee3d0586