Snap for 6877830 from 4f8fff8eb7116b41fde99aca003f6766301f492c to sdk-release

Change-Id: I8944b320d088335de9454b86d88c4161c6cc069d