Merge change 23475 into eclair

* changes:
  Return appropriate URI for PICKER intents.