Snap for 7110675 from 6a5d57c2ee14d456089db016160996104cddfabc to sdk-release

Change-Id: Ia0348be5228e4dc44c6062161f1090a1d2c42e02