Merge "Fix role test broken by new dialer requirement." into rvc-dev