Merge "Do not block for connector in TetheringManager"