Snap for 6611069 from 5c33e29ec2cca9c5061e739eae2e453be00a3c1d to mainline-release

Change-Id: I0f0b2ddd242291794ef74b3350ee50645993eacb