Snap for 10453563 from bbb101d25e92b5dc80aca428fa355d6e27da9ecc to mainline-art-release

Change-Id: I3ac9869eaef585b8ddbe8e4aa9a148c3ce27e469