am b1696f64: am 23ec3e46: (-s ours) am 2f9e1db3: am b5d6ad81: Merge "Stop calling fsck on shutdown by default"

* commit 'b1696f6436227f582a5139039e935c5215466747':