Merge "Add owneship of tethering module"