Merge change 22945 into eclair

* changes:
  Add a null check in PackageParser