tree d4ac2332fecef9fb75a6832b2a0a68964d80f7b4
parent 14ff71712caad5ff2679c5224575ecffac6ab65d
author Winson <chiuwinson@google.com> 1571852972 -0700
committer Winson <chiuwinson@google.com> 1575684328 -0800

Revert Revert PackageParser#Package fixes

To separate the changes from the massive commit that reverted the revert,
this commit includes any rebase/merge fixes since the original commit.

Change-Id: I556881a44068d38e6816f445d138f4b4e48d2df0