Merge "Fix TetheredClient and TetheredClientTest" am: 8451e20d98 am: 8ab2f58ab9 am: c8190ff316

Change-Id: I8a3d01dbd02639e07284a3dc6798c0db512c8307
tree: 473af7358627e9d12d7466c2b070deeefbbfe080
  1. Tethering/