am 2eed10ac: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '2eed10ac3f0386d814a7f92e51ee4850fdc7e8d0':
  Fix issue #9000597: PackageManager get NPE while running performance plan