am 9b44ccfc: Small changes missed in the original submission of 22482.

Merge commit '9b44ccfc38c2fc2a6cf2c3cc39a13cc5bce635ba'

* commit '9b44ccfc38c2fc2a6cf2c3cc39a13cc5bce635ba':
  Small changes missed in the original submission of 22482.