Merge "ART: Refactor run-test 911" am: 0a5fa0cf48 am: b20b623690 am: a252b4b6cb
am: 0bd5bb8a92

Change-Id: If740c34065cbee1ee6826a8146de39b6ddc9228e