am 4e67a2a4: Merge change I22807d19 into eclair-mr2

Merge commit '4e67a2a46507299a1aa8f2b94c33c3f65e5f78e2' into eclair-mr2-plus-aosp

* commit '4e67a2a46507299a1aa8f2b94c33c3f65e5f78e2':
  Do not use the Cursor if it is closed.