Snap for 7924065 from 9dc84b567c89dec5581db16b2d9c536c4e66d5f6 to mainline-art-release

Change-Id: Id6cecb66d7393fdcab947354db2c635c119ce05d