Merge "Revert "Revert "HACK: Run e2fsck with -f""" into nyc-dev am: a1a8a82
am: 2f5d1da

* commit '2f5d1da43edc8a61015f24493921f3382e9e91e9':
  Revert "Revert "HACK: Run e2fsck with -f""

Change-Id: I792a457b56f12c50df4ef3f99c74d376ebd9180a