am d63563fb: Merge change 5761 into donut

Merge commit 'd63563fbb0cb6e8bd3d85b731450db7cbd82c3b3'

* commit 'd63563fbb0cb6e8bd3d85b731450db7cbd82c3b3':
  Misc cleanup from a previous commit.