Merge "Look up CBS package name through PackageManager." into rvc-dev am:...
Merge "Look up CBS package name through PackageManager." into rvc-dev am: b8624208 am: 5304dab2 am: 6177c517 am: 061407ca
Change-Id: I5ba76f06b953338acdab778c8d13d24401cade54