Snap for 9550700 from cfc8963c7cdf0c20a8c0876160de9f3b3ce82e02 to mainline-art-release

Change-Id: I27e5c1651b4438f9eb44fca80a79c3bce3122122