Snap for 8005954 from 054bf812d31bb36f7e6c5a39367fe098aba7c64d to sdk-release

Change-Id: Icacbbdf4e32133fc941f486cd7502d51cb37c0ab