Merge "ART: Fix test 904" am: 6136dc6841
am: 9bb0bae74c

Change-Id: I3af40731f0cfd66a27bc5f15f441af610b3bb7fe