Merge "Performance optimizations in generatePackageInfo" into nyc-mr1-dev