Merge "Add tethering client callbacks"