Merge "Follow PackageManager refactoring."