Merge pull request #32190 from vieux/cherry-picks-17.04-rc2

cherry picks 17.04.0-rc2