Merge "Look up CBS package name through PackageManager." into rvc-dev