Snap for 7800789 from 7ef78c8ae2ae8e2762b5f48f69973990a696a56c to sdk-release

Change-Id: I46f0e4fbfdbebe9708f3fa6ccdf7ae0e247ec2f7