Snap for 7110675 from 9afab995831cce153224ddf3f48ec39d963e0f40 to sdk-release

Change-Id: I769c03f6b82579b4afe6c99bd19a9d03c2a159e5