Merge "ART: Regenerate test data for 952." am: d1760f3b6a am: 1c8b1b473e
am: 361f890bba

Change-Id: I2f6199551f086a9d5eedaf20b7376186ecc1921d