Merge "Add SettingsShim for tethering module"