Snap for 7800789 from 4c84bf6404661f813363e377cb23691937467728 to sdk-release

Change-Id: Ide3d26e750673f8846c32b48b40af0e498fb20c3