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

This reverts commit 11b8326aa3b6d1f14b9fe289978c44b89554ff8e.
Merge branch 'cm-11.0' into kk_mkt