Merge "Restore historical behavior with fsck_msdos (always accept fixes)." am: a2518c7fe7
am: 8941a145a0

Change-Id: I3ccf537b4802baf6ff43b1ff3b24f44c59e9fa08