Merge "Fix TetheredClient and TetheredClientTest" am: e5fe55eddf am: 8ab2f58ab9 am: c8190ff316

Change-Id: I8a3d01dbd02639e07284a3dc6798c0db512c8307