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

Change-Id: I4ad0e370ace2e6f24df93a8581ce753bb4a84617