Snap for 10453563 from 385bce15785129cd36bb1c346d0380f19d0c3ab1 to mainline-art-release

Change-Id: I23f67a235c1a26c6bdb5518f4ec67534faca0765