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
am: f910dab5f7

Change-Id: I86bda42056b6af37febccf48ebe09ee6363b50d0