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

Change-Id: I65d4c39f8ed23c31198cfd5187aa7fadff7f5efd