am d31db759: Merge "Fix issue #9000597: PackageManager get NPE while running...
am d31db759: Merge "Fix issue #9000597: PackageManager get NPE while running performance plan" into jb-mr2-dev
* commit 'd31db759':
Fix issue #9000597: PackageManager get NPE while running performance plan