Merge "Fix issue #9000597: PackageManager get NPE while running performance plan" into jb-mr2-dev