Snap for 6877830 from 3c30879817971584798f8db4b92686009f873298 to sdk-release

Change-Id: I05676e31d989d546de5ba606c5bcf29e20b2c3ca