Merge "Add a helper function to query CBR package name." am: 6bf3920e7d

Change-Id: I873c17da960023340faf51bab0d611b4e0b748cb