Snap for 10453563 from 8d5268645dc18eaa32271113df3b921073778da2 to mainline-art-release

Change-Id: I588c946122dd0762a1befcb3de5ef19640d5dcb4