Snap for 7183507 from 2fdb46f02616301a2a34da818e58fa44f12696cf to sdk-release

Change-Id: I7158df4f2edcfd2c82e0618394b1f1ac0b782514