Snap for 8005954 from 5ac950e3389ced48fae00b48e17e4bca685d1adb to sdk-release

Change-Id: I6d98cd2a31e33239f833c48585da489ce9bf9c76