Snap for 7110675 from 2997fa666a676a306df7fe4cbc53684d770c0a2c to sdk-release

Change-Id: I60b04295ce82c87fca0986c0e6a66c6e4d362014