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

Change-Id: Ib141600dbd9a5471a1c452d2514f89e0d234b5d6