Part of change 4728. (cherry picked from commit d0d2ba9546) (cherry picked from commit b85bb66388)
d0d2ba9546
b85bb66388