Merge change 26813 into eclair

* changes:
  Compare rawContactIds using actual number value.