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