Merge "Revert "Ensure that run-test preserves exit status"" am: e0d52dce6f
am: 8f2f7e8ace

Change-Id: I9c7be6d324776264bd46558dd7704c57bdabf267