Add soft-reboot option

Change-Id: I4d5ff00a184ea7cb3efe20aca4fad848a86f56d5
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0