am 0d0e7012: (-s ours) am 95e3548e: Merge "Close cursor to avoid excessive JNI references"

Merge commit '0d0e70129c821da7ef6cae09bca7078d2fce1992'

* commit '0d0e70129c821da7ef6cae09bca7078d2fce1992':
  Close cursor to avoid excessive JNI references