Merge "reboot: only run fsck when detecting filesystem inconsistency" am: 91b5adfc88
am: a030ede795

Change-Id: Ideab753a0b71dcb5cf26e3f05679497cc204da96