Snap for 7800789 from 0b82ca0b1da3856b33ed94a5e4d8106bad3a5eec to sdk-release

Change-Id: If1938fae55644311942d31666345e4ee92c85ebd