Snap for 6877830 from f2b95dc36d5c04d6d01a4a7556f2dccab3d73ba8 to sdk-release

Change-Id: I38b99c9cf81ce9712b235be358ce341def07902e