Merge change 26295 into eclair

* changes:
  Don't CCO when picking from disambig list.