Merge "Add a helper function to query CBR package name." into rvc-dev