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

Change-Id: Id0f1d008b69e2cf7ef3029a724f767a74139c4de