Snap for 6877830 from a3af76adb4715dd6e2f40cc7f165e52670a72a9a to sdk-release

Change-Id: I5d6d2c056f12b0c04d27965674c0358f05b6d02e