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

Change-Id: I17b53b5d7b9bc091fc9b67fc334c94e17826ff22