Snap for 7110675 from a808f0b96818463b4f91191aa7240d0a658b7cfd to sdk-release

Change-Id: I4648078fb186cf2cdf9fafd687554e27f3999988