Merge "[pm] fix NPE in deletePackageX"