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

Change-Id: If0212af9c8fa35b190640ed2bf4bd7332078625d