Merge "Snap for 9979206 from 1494f05cc32165eef4c73a6eb6b51fe235bc1d64 to sdk-release" into sdk-release