Back to kill app mod [1/2]

Credit/Thanks DaneshM

Change-Id: I4f2e57e38ac6d09f5dc6e4a114d49b51aa9a9aef