Merge "Remove unused resource from TetherServiceTest" into rvc-dev