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