Merge "Fix bluetooth test broken by Service change" into rvc-dev