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