Merge "Minor improvement in logging in TetheringConfiguration" am: 39ce589f0b
am: 8211c36db9

Change-Id: Icf1f42b76998a3c7f4fd4285beb89e1310e5413d