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

* commit '23ec3e468b6111d1f610df6f8eb1340016ce5732':