Snap for 10453563 from b4445a27b7d1439a405cc3e8afd71de53639624c to mainline-art-release

Change-Id: Iad861c798025a8b7a2f967bd4a1bbe6aa4edfa46