am 2f1d4e2d: am 254e0d49: am d98c87c9: Merge "init: Fix chown and chmod for write-only files"

* commit '2f1d4e2d2d6d3d8969a6054778d0781766f33de7':
  init: Fix chown and chmod for write-only files