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

* commit '46449b8bbca2b937771d284c081012ff4696cbe2':
  Fix issue #9000597: PackageManager get NPE while running performance plan