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

Change-Id: Id9d0f48b34e50af5e8780e062f13ff9ba23bc892