Add soft-reboot option

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