Merge "Fix TetheringManager memory leak"