am 78b7722a: am 0b2f8f6c: am 665ae145: Merge "Setup filesystem for automatic forced repair"

* commit '78b7722a5da28cf5bf036d0166a7c3c636edb834':
  Setup filesystem for automatic forced repair