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

* commit '69af53d7d03a78735511c128f3b71cb1454034c3':