am 843aa4bc: am 485b2617: am 14799c62: Merge "Add WriteFdFmt and clean up more code."

* commit '843aa4bcffb94abcc8813ab6269885febee9113e':
  Add WriteFdFmt and clean up more code.