Preventing cursor leaks

Change-Id: I0cea0615134d92fe8569262099de4ab13d75e5ef
2 files changed