Snap for 7800789 from 3b418d01f15532fbdf1012b220a35ba2036bba8d to sdk-release

Change-Id: Ib6894caeb414af65b56f37dc175559f7df2affd0