Merge "Fsync directories after creating files" am: a892eb154e am: 7c21f0a999
am: ac6adb1763

Change-Id: I386c3d94163037e0fdb1035bba6850e15ca85183