Merge "Make TetherSettings use the new tether api."