Snap for 9881287 from 11fcae464fcbfe07d40ed3536bfbc67538533c6e to mainline-art-release

Change-Id: Id8d471f6a8d5b199de220a2b84eab33a9b36d89f