am 236f03fd: Merge "Don\'t return NULL as a jint."

* commit '236f03fdc589f800623f1830ff1aa2b640c6a1ef':
  Don't return NULL as a jint.