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

Change-Id: Ib2b6407e483fa959b256c5d782f8fb63371dff00