Merge "Snap for 12779445 from 754d8c4235def553d7d5d0a8a85ffb8dcb234001 to sdk-release" into sdk-release