am 3e7dfab3: am 04776329: am d810b894: Fixing breakage in Legacy Contacts API support uncovered in CTS tests.

Merge commit '3e7dfab3010fcf39841445c2423384086c4ecc92'

* commit '3e7dfab3010fcf39841445c2423384086c4ecc92':
  Fixing breakage in Legacy Contacts API support uncovered in CTS tests.