Merge "Add TetheredClient tests" am: 97e28ae76d

Change-Id: I773efff81aad8324be730c56034da30003ba4974