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

Change-Id: I0f01c2f65b0a7abdb4dd3a964c046efacaf4a687