Snap for 7800789 from 6112bbfe7ec0bb42a4ae8571e8700d4878140c41 to sdk-release

Change-Id: I682628ffd216cbf195e2d624e566461e1f9ed4e0