Fix leaking a cursor

Change-Id: I1953ea995e83eb4f787f28b0fd510805e4ffc6eb
Automatic translation import

Change-Id: I910fbdc44f03b115fc5df2e4cef2291e3e1bdc0d
Automatic translation import

Change-Id: I6cd47e5eb5e97633c886f0feaa7c1d06ea006932
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0