Merge "Add TetheredClient tests" am: 97e28ae76d am: 9492c6f4dd

Change-Id: I094a4f8dcf7b5b1392065166c01113ce0fb97b9d