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

* commit 'f04a7690b53288c98c07e0aa05214cceebea1331':
  Avoid leaking cursors