am 1cbbf23d: am fdb001c0: am 699ac753: Merge "Fix NPE when cursor is null" into lmp-mr1-dev

* commit '1cbbf23d5b141d6040fd7d090ed03adf30218806':
  Fix NPE when cursor is null