Merge "Generate external annotations for the annotations library" into nyc-mr1-dev