Merge "Add tethering client callbacks" am: 195fc89155 am: 6b281c9304

Change-Id: I98aa24d6bce451c5f80de7a6507659aaf066902d