Snap for 7800789 from e1945884c06a351a3bc34fc4bb10147025489dd8 to sdk-release

Change-Id: Ia6c1e9ce2fd7bfc60d51558ffd6c83a2dbf307e0