Snap for 7843118 from e12fba8b09fff7f1caa73a19efdf1cc1d1ae4e69 to sdk-release

Change-Id: Ic2f18d0f3d50972f3887c4f19dc072ec728c0d98