Merge "Snap for 11724015 from 39fb2e6fdaf52da4c8dc29db59b33d7ea64969c3 to sdk-release" into sdk-release