Snap for 8005954 from c6d44ef2bae7aa786c7a5d315cf9ae6d3ccb533e to sdk-release

Change-Id: I927fe4619db83338541e19b43887c5a505e5a22c