Merge "[automerger skipped] Merge "Fix up discrepancies between v1 and v2...
Merge "[automerger skipped] Merge "Fix up discrepancies between v1 and v2 package parsing" into rvc-dev am: 9f15ba2e am: eaf090e6 am: ab785e42 -s ours" into rvc-qpr-dev-plus-aosp