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