Merge "Add a separate namespace for Tethering module."