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

Change-Id: Ia91bf6d21ca241d825753834e8c2d1cfa7c591eb