Merge \\\"Use proper lock when accessing the generation registry\\\" into nyc-dev am: dcf2e205 am: 8503bf31 am: 404862bd Change-Id: Iaa0d2fc1c06aa3cd786225bbfd459be50f7bac31