am b65a90d7: Merge change I73b00501 into eclair-mr2

Merge commit 'b65a90d76ff486208974f0b1dac8e880ba29174b' into eclair-mr2-plus-aosp

* commit 'b65a90d76ff486208974f0b1dac8e880ba29174b':
  Check cursor and URI value for nullity to prevent NPE.