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