Snap for 8005954 from 4d58dba651fd4e5db8ff7875caceaefb8f58ef70 to sdk-release

Change-Id: Id6f0ccbf75b2cce171390560d12b1ad3e7539eb2