longpress kill modifications

Change-Id: I6c2313f9702c76bbe6ec5a10f69aee413bedc3fd