Merge change 25437 into eclair

* changes:
  Fixing breakage of legacy contacts API support broken by an earlier CL