Merge change 25232 into eclair

* changes:
  Fix NPE when provider returns null cursor.