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