Snap for 7110675 from b7928292ddd2d53a203c6f8181c30038b359d081 to sdk-release

Change-Id: I3d4e638a51014f65dc5bebf1a43ef849faf67ce3