Snap for 7110675 from 9bb00c00e9e205fce07bb3d9fc47f6970f44d70d to sdk-release Change-Id: I384bf859b519ee9cdffd592a1aa540438dc3582e