am 90e7485d: am 02562d30: Merge "Avoid leaking cursors"

* commit '90e7485d68095b5fc5044dd1bc6cd4dfc485eaa3':
  Avoid leaking cursors