Snap for 9979206 from ec3d90cee3f3138846312c155b60fda0d75444c3 to sdk-release

Change-Id: I788d36d7edc918c1e8614756a1d4d50ac12b6231