Merge "Move several config elements into TetheringConfiguration class" am: 8d35276910 am: 81499754bc
am: 46f036c6da

Change-Id: I29fb42f75f0bd660f003794b47164d119a3e57ae