Merge "Allow tkill" am: 9fd1190790 am: 81b76391d3
am: 33d0bb6483

Change-Id: I75a8851720840c74c16fc3dcb753fbed9bc00531