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

* commit '699ac7532c2b567e4d1041bfbb0472d5c5e74571':
  Fix NPE when cursor is null