Merge \"Performance optimizations in generatePackageInfo\" into nyc-mr1-dev
am: 4d9af67fe2

Change-Id: I55dc84ea787cb886f4f54d7e2af00a8d578b160a