Snap for 7843118 from 568c0bada611f247fec8188e5cae15e9e709ebae to sdk-release

Change-Id: I5f4f04a39a1f3051c87d79df50e83b215095a668