Merge "Add TetheringServiceTest unitest" into rvc-dev