Snap for 7110675 from 0d452fd6f8a6703311675254dd8cd61b184dffcd to sdk-release

Change-Id: I75621278d5231d85a8449f0d00eecc0d5802d602