3.5.0 cherry-picks:
git cherry-pick -x ca5c5b997b348e650a086965c5e975c7101ee40e git cherry-pick -x 56540950e73d331fc04443409c578e4354337309 git cherry-pick -x 426dc5eb28bade109bf27bdd10d7305a040b4a3e
3.5.0 cherry-picks:
git cherry-pick -x ca5c5b997b348e6 50a086965c5e975 c7101ee40e fc04443409c578e 4354337309 09bf27bdd10d730 5a040b4a3e
git cherry-pick -x 56540950e73d331
git cherry-pick -x 426dc5eb28bade1