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

* commit 'b5d6ad81cb963b6eceeb21c7f93bc433112c4b35':
  Stop calling fsck on shutdown by default