Snap for 5735642 from b9715000e74ed9a10b5c264b4bb4b15357506d48 to sdk-release

Change-Id: I4b6f3e0fc07dce3dbe09fd4c022c64f081bb9ec9