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

Change-Id: If7706e1286847e02df34b6fce48c8de99b726d7d