Snap for 8005954 from 52c5b21f66eb658d714c72e93cf3b54e9f0c624b to sdk-release

Change-Id: I4e6c4750b20a9ef3f4d339b00a54d0fc6cb422ab