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

Change-Id: I24c944e63346322274f7491da72561bbf12cd780