Small clean-up for shell kill command

* Fixed syntax error
* Improved return value logic

Change-Id: I758a7bdecb8728814823d77f7360fcc8dc03c176
Merge "Small clean-up for shell kill command"