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

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