Merge "ART: Make test 924 more robust"
am: 63badfb7f1

Change-Id: Ief01df3cd7f59f43834048b0c30c7f60238a8c42