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

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