Merge "ART: Refactor run-test 104" am: 2dcfe269a6
am: 647b700b65

Change-Id: I0d2f1aa2d06b3e8a0b9d536761d396025c5d195e