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

Change-Id: I6ddfcaa6bfabb1dec2e7466a8778a019f589cd32