am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."

* commit '8f592378a1ea7f31d57253dc202f42707ef4da36':
  Fix a variety of small publicly-reported bugs.