Merge commit '3546825421cab5330583633ed854134c35d1c08d' into eclair-plus-aosp * commit '3546825421cab5330583633ed854134c35d1c08d': Allow us to set the contact uri without setting the fast track's uri
Merge commit '3546825421cab5330583633ed854134c35d1c08d' into eclair-plus-aosp * commit '3546825421cab5330583633ed854134c35d1c08d': Allow us to set the contact uri without setting the fast track's uri