[automerger skipped] Merge "Migrate remaining parsePackage V1 to V2" into rvc-dev am: a83fad74 am: 30de689a am: 8ee565f3 -s ours am: ed720e40 -s ours

am skip reason: Change-Id Ib21dbbdc556502144df8e3d7a26b7a9d33885cd9 with SHA-1 3cb5610a is in history

Change-Id: Ie05a95503c823c07cd4e771fa1f96fc4f0c93c32