Merge "Fix TetheredClient and TetheredClientTest" am: e5fe55eddf

Change-Id: I4c9eae17b06e37ef5bb35d0f23e572e6edd0b579