Add soft-reboot option

Change-Id: I5058012500d948fa65e3bd97e10c799bdaddd10b
Merge "Add soft-reboot option" into cm-11.0