base

Merge change 26720 into eclair

* changes:
  Allow us to set the contact uri without setting the fast track's uri