Snap for 7800789 from ab47e042d9606f82bbaef7193a7ee3b9fd4c5f39 to sdk-release

Change-Id: I292f84b38482917d2aff37192fbda2b111b2d293