Merge "Snap for 11754915 from cd6618b619b1b614991550b46be9f23e6fa5f350 to sdk-release" into sdk-release