Merge "TetherController: Fix a memory and fd leak"