Snap for 7800789 from 80a68eefdccd99baeea4880baa1b4c25f2618725 to sdk-release

Change-Id: I0337c713b155579b4a9b3e75199bbb1e50af3032