Merge "Fix AnnotatedElement.getDeclaredAnnotation() generic signature" am: bd32321b4f am: 125a273e8a am: cc1cf38749
am: ff2f0dae1b

Change-Id: Ie367eabde7b2d8d5685f77ab741235817125af7e