Merge "Snap for 5234541 from b651a1c9a39342ca3810ff5575c2471714cc176c to sdk-release" into sdk-release