Merge "Snap for 9979206 from a4ad1f2637b21fed9030552136b9a1887a76a944 to sdk-release" into sdk-release