Merge "Fix null pointer in processing of enum annotations." am: 3944f7175d am: f8a2a7ef22
am: 2ee6e8c8ae

* commit '2ee6e8c8aeae913283efed8c1285f7613c377650':
  Fix null pointer in processing of enum annotations.