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

* commit '69920427ea01421d34f3a7576bdd135527b20859':
  Fix a variety of small publicly-reported bugs.