Snap for 6647781 from 6eb169944a6da8810faa4f23a5896cd04b1b76ca to mainline-release

Change-Id: I58af81a5df13f729a6b4d4fcc6104570287e9247