Merge "ART: Rewrite test 911" am: b3f2284d10
am: 7f8ff33fa4

Change-Id: Iac5e9e95f60fcee5b98473c1aaba089e317cff1c