am 2f9e1db3: am b5d6ad81: Merge "Stop calling fsck on shutdown by default"

* commit '2f9e1db37416cdb580d870218b5fbfbed47a3758':
  Stop calling fsck on shutdown by default