Back to kill app mod [2/2]

Credit/Thanks DaneshM

Change-Id: I6da308beeb120bc0273cc69cb05372385e3c411d