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

Change-Id: I4cb91299d86d9055b089064cc0a0e884f9bf9cd1