Merge "Fix ART run-test 562-no-intermediate."
am: c46e708aa0

Change-Id: I2fd9c798a66e49e52cf7dedd487aaab61a36b3c8