Snap for 7924065 from 1dde03746869e41ba1607164645974bc585a14dd to mainline-art-release

Change-Id: I33ee3d43100574af7e6b28ee11590b39c1c17e26