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