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

Change-Id: Ia9e4b26e1d243f006ac181c8e75233305f2444d8