Merge "Restore tkill for LP32."