Snap for 11671125 from 131c28e7822fc4ecdd1a95db74b621acf9a54499 to mainline-art-release

Change-Id: I0f07fbd0985abb4e46a426d5427cd4d7f00ac5f7