[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: 6bc0cb33 am: 9cd6c21c am: 223d89b2 -s ours
am skip reason: Change-Id Ib21dbbdc556502144df8e3d7a26b7a9d33885cd9 with SHA-1 6b6adc11 is in history
Change-Id: I9d17d7c4100a390973772775fcd922126471980d