[automerger skipped] Fsync directories after creating files am: 2e58acb412 -s ours
am: c6f4d9d5ae -s ours
am skip reason: change_id I53d252942c21365983b4f8b6e0948b1864f195c1 with SHA1 621d9b9732 is in history

Change-Id: I920346bf310aab6a16cea70d6e213fcff325134c