Snap for 5925869 from bf198f3182e53f3d1dc9d061f558656e59f5d4c8 to sdk-release

Change-Id: If93a9d416e98ff5fa4aa3d6aa4b32bd3a45853b0