Snap for 12199818 from 827505df51baf25f9321baa1454737080ad1185b to sdk-release

Change-Id: I498deadb8312def519a492826119205877da15e5