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

Change-Id: I83254cf3f4caf43218f3e542823c65e69e01bfc6