Snap for 7110675 from 908cc7dc04061b864308766c39ad2ff40783468b to sdk-release

Change-Id: Ifdcc99c673f6ef59385471a813f833a6bf3af00a