Merge "Revert^2 "Ensure that run-test preserves exit status"" am: 18973583cd am: 880fb9844c
am: 091a5c3d7a

Change-Id: Id4c2f2b74c1e4225701ac621eee5df4a479d2658