Snap for 8005954 from 0f74fbfdb6f1d626a931358e9d5a7a5210217800 to sdk-release

Change-Id: I0296b5f9bb18e1e7cb76d44a7501da2d5f930da5