Merge "ART: Make test 030 slightly more robust"
am: 66ceada00f

Change-Id: I5b209d742eac313e1a95f19e872c4fd1fa298dd4