Snap for 7110675 from ecb6afe310d65154f4b3e63dc39ea490a2fd1768 to sdk-release

Change-Id: Ibeecdb48e8aab019dbd8369ebffb2d5ece985ba8