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

Change-Id: I9e83dfff67e43a657b14e1a2ad15cf1c8c2b8074