Merge "init: fsync() persistent properties directory after rename()" am: 1022f0de11 am: b60599dff2
am: e6bfadf8ee

Change-Id: I036a96cc1a9f1e4194f5e1f7d30be1544b003c2e