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

Change-Id: I49771951b8784010e291ef812f62a483ace8ebe8