Merge "Fsync directories after creating files"
am: a892eb154e

Change-Id: Ie25f2da2e3340430aea066683acde59b3100aa79