Snap for 6302218 from 4ed7e62ae69cabb9736ef97988532266109240a4 to mainline-release

Change-Id: I52862cfa489ac1cf2afad8f3bc08b42a099942aa