Merge "ART: Fix test 912" am: acac09dad3 am: 57bbef641b
am: 4e5595842d

Change-Id: I4d57d571d2b096ba3ea482bf23fbb5e7318642eb