Add support for both soft and hard reboot options

Fixes bug #1088859. Thanks to Yufang Zhang for the initial patch.

Change-Id: Ic91feb6859586c2df1b6758f72f3981039914095
Merge "Add support for both soft and hard reboot options"