Merge "ART: Make test 924 more robust"