Merge "Use fsync instead of sync during first boot"
am: 654a37cd65

Change-Id: I7f31af52f578b0157007fbc728e929f4a05d7ae0