Merge change 25602 into eclair

* changes:
  Allow EditContactActivity to use a picker