Snap for 7110675 from b5e069ce96d5914d920433408fb0038a57779d68 to sdk-release

Change-Id: I2a2b85d07d8831656c42906d5832c070726f99f2