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

Change-Id: I3f3d044e643854f994ef162cc77ada5202170ac0