Merge "Allow tkill"
am: 9fd1190790

Change-Id: Id45daedeecc72308db9616b302a7bf23bd4beb28