Merge "Fix null pointer in processing of enum annotations."