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

Change-Id: I00b1a6aba01fd9155e4b0db17e9bd65d31425489