Merge change 24662 into eclair

* changes:
  Fix URI returned by IccProvider.