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

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

Change-Id: I8943c573dea631e4324b3b6a621dc791c55f667b