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

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