Snap for 7110675 from 9bb3ec0fb59cb12c2a0842e752ea43d4c75689f2 to sdk-release

Change-Id: I7f9ef0946daa8c6299c8fc140b6ce02e23a50351