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

* commit '3944f7175dcf60316ba58a42698ccf23c65ac57c':
  Fix null pointer in processing of enum annotations.