Merge "Fix bluetooth test broken by Service change"