Snap for 5735642 from a2d0f90826041f1c610f1f020f7c761c7bcb3152 to sdk-release

Change-Id: I1bb5370e3c8fbabd253183b00e8826f9dc517e59