Merge "Revert "HACK: Run e2fsck with -f"" into nyc-dev am: dc6893c
am: 131aabd

* commit '131aabdf0ee4574f7bac5a504cdca622533554b1':
  Revert "HACK: Run e2fsck with -f"

Change-Id: Ia5e106a56220b930f4c6cd73d45dfdd327061026