Follow PackageManager refactoring.

Change-Id: Iae8b40acf6317366f0de780e367e0c21a9966477
7 files changed