Merge "Migrate remaining parsePackage V1 to V2" into rvc-dev am: a83fad74b4

Change-Id: I42bad76fde7dfe0470976c9ce4df36a7ca8548ff