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

Change-Id: I9ee05b5bd0fe6619a77baf1315cebbb517f144cb