Snap for 8952093 from af6e4abba82e7811dbfe7dc7b93e146946bd7c78 to sdk-release

Change-Id: Ia560357738b2d3d06262ee0f3a6a67fb8f496d26