Snap for 10453563 from 6f3875a7c631777c3ce629036716cadaf42c3116 to mainline-art-release

Change-Id: Ibb4ef321b27c9a6f85404f643f44eb870281ea59