Merge "Fix native annotations returning TypeNotPresentException."