Merge \"Merge \\"Use proper lock when accessing the generation registry\\"...
Merge \"Merge \\"Use proper lock when accessing the generation registry\\" into nyc-dev am: dcf2e205\" into nyc-mr1-dev
am: d0302f57
Change-Id: I8cd55faa5e8c788752ae411f29f29d9261f327c0