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

Change-Id: Iacce6caff8667a3b25ac29c8ff90edb64bd6f49e