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

Change-Id: Iaa0d2fc1c06aa3cd786225bbfd459be50f7bac31