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

Change-Id: I1ab1849f80f3830c12506210329ba667f7c72488