Snap for 8564071 from a06f3e32ddac3d4ed41805756b225eb040844c19 to mainline-art-release Change-Id: Ife3e50b5b92e998bcb46ddd44b89a9401531c71e