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

Change-Id: Icbcb5572beb8b055873debf665801fdb151c21ee