Merge "Make sure volume is vfat before fsck'ing." into mnc-dev