Merge commit '440110fbfe00fa8f16087b33f0f3057e0ca057a9' * commit '440110fbfe00fa8f16087b33f0f3057e0ca057a9': Revert change incorrectly submitted as part of change #32153.
Merge commit '440110fbfe00fa8f16087b33f0f3057e0ca057a9' * commit '440110fbfe00fa8f16087b33f0f3057e0ca057a9': Revert change incorrectly submitted as part of change #32153.