am ce6f7cc5: Merge "Return a more specific type from AnnotationFactory.createAnnotation."

* commit 'ce6f7cc54d4b71b2fd33288c8bf7c0fc863745f8':
  Return a more specific type from AnnotationFactory.createAnnotation.