Merge "ART: Add debug code to run-test 913" am: 39d562895a am: 6c1a074521
am: b27e84290c

Change-Id: Ia777d13b906e0611821c92bccc14477ba6ebf842