Merge "Move several config elements into TetheringConfiguration class" am: 8d352769 am: 81499754 am: 46f036c6 Change-Id: I29fb42f75f0bd660f003794b47164d119a3e57ae