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

Change-Id: Ied15d0d7a1d3fb1c93ba15b6f04c3d0f0cd52726