[automerger skipped] Restore historical behavior with fsck_msdos (always accept fixes). am: 3601f4790b
am:gugelfreicd5df6e1ef
-s ours am skip reason: change_id I1d50a7e52fda34e59eb6f051c7fde115a6cd5255 with SHA13d3a9a7f1c
is in history Change-Id: I8c1479273fc202237237f57a3ed2e79401083dd5
commit
201932c1b9