Snap for 6877830 from f06889aadbb536839c6c7e91c3fb022a53701d5e to sdk-release

Change-Id: I207af084639572d14d0d92ce9e1d88576d282c63