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

Change-Id: I648298b8748fd6c1fdc6b17af3a8d013dbe2c9c8