Merge "Use fsync instead of sync during first boot"