Merge "Merge \"Use proper lock when accessing the generation registry\" into nyc-dev am: dcf2e205" into nyc-mr1-dev