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

Change-Id: I7292168b8684759512e3fb6279d3a00adaa77571