[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 skip reason: Change-Id Ib21dbbdc556502144df8e3d7a26b7a9d33885cd9 with SHA-1 3cb5610a is in history
Change-Id: Ia8a48ef4def3e0781f300397532a80d98b785263