otter: Enable soft reboot option (2/2)

Change-Id: Ifaca36062877147d4cee8b5e22bbfc8c0eb3a5ba
Merge branch 'cm-11.0' into kk_mkt