Snap for 9867090 from c7197a13fdeb389d50478e848d4ccae9efee8399 to mainline-art-release

Change-Id: I338d33a9b32142e4a062b1219a817a18292d5323