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

* commit '254e0d496e11b30cd9e4f9324f3514be7e85f6d4':
  init: Fix chown and chmod for write-only files