Merge "Improve PackageInfo parsing for apex files"