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