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