Merge "Move TetheringConfiguration out to its own file"