am 1c9d1eed: Merge "Fix native annotations returning TypeNotPresentException."

* commit '1c9d1eed31565cc0b21689b5530ca0ac5d35c68a':
  Fix native annotations returning TypeNotPresentException.