Merge "ART: Refactor run-test 904" am: c830101281 am: 5d527ceccf
am: 40626940cb

Change-Id: Iab04fa796301aabb18fac0a9c046140ea6d2d22c