Snap for 7110675 from 094f9a7a6e82613b3c94dee9faa29be7d38ef8df to sdk-release

Change-Id: Ieb7adb6608ea73f25f38acf96ecb748b2299dacd