Snap for 6877830 from 814eed0db0a14babb1292a7e72b48665def64a4f to sdk-release

Change-Id: Iae7b24682766f60d456de098ec3fb9d81d160bf1