Revert "Don't return immediately from reboot commands."

This reverts commit 11b8326aa3b6d1f14b9fe289978c44b89554ff8e.
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0