Merge "ART: Refactor run-test 924" am: 70d9cf92f6
am: 414977a488

Change-Id: Idaffab17f11b5527f289f925b159064145898a35