Snap for 6877830 from 7a56081cce6e3b1304840c8145eaff05b1c9b8c5 to sdk-release

Change-Id: I3d42cb11f8e9e067ce351b213b18449a4d288670