Snap for 6877830 from 2972d1df1f1e24830243ad0366b2f922a8e72cb4 to sdk-release

Change-Id: Ie2c47e874d81a5c7c2358263cda7b582b2c3fdf9