Merge "Add TetheringServiceTest unitest"