Snap for 7110675 from f6e7cfe3af95f19727306fe9b5618ac66ff96548 to sdk-release

Change-Id: Ib58b1906f3beb4ec49dbc653341601bc78cb6dea