[automerger skipped] Merge "Migrate remaining parsePackage V1 to V2" into...
[automerger skipped] Merge "Migrate remaining parsePackage V1 to V2" into rvc-dev am: a83fad74 am: 30de689a -s ours am: 32869006 -s ours
am skip reason: Change-Id Ib21dbbdc556502144df8e3d7a26b7a9d33885cd9 with SHA-1 3cb5610a is in history
Change-Id: I3c50ce815c749f5cf9983013ddbefefdb7f44eb8