Snap for 8005954 from f0688e4a3557ad78e69505c2c6c7ca40fa9d2680 to sdk-release

Change-Id: I380098cd8e50a6c7df8f79add0576e2b6f5764c4