Snap for 7800789 from 15b2ffb6bfdd65de2fa8a61701ff3e2da6ebf5ca to sdk-release

Change-Id: Ia345be9dc44106a66ad1e9b464962b39928e68c5