Merge "Fix a NPE in PackageInstaller" into nyc-dev