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

* commit 'fdb001c0028adaca480c34c6d05665571285bf17':
  Fix NPE when cursor is null