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

Change-Id: Ifb1e8a5dca6a4e1db51cb895270c14b7e7c464fd