am b164b103: am 5e753100: Merge "Clean up reading and writing in init."

* commit 'b164b103ebdcb2b567079f30e38d878a21a9b632':
  Clean up reading and writing in init.