Snap for 7800789 from f04dc7091100941b42269fd7894dbadd1c93204c to sdk-release

Change-Id: I5af9d25f0dfcb5819d43c44ae0ea4bec4867e04c