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

Change-Id: I86764ef7743af67c29de69c907121a77e4a55e9c