Merge "Merge cherrypicks of [1330941] into sdk-release" into sdk-release