am d6138017: Merge "API changes per API review for contacts" into lmp-preview-dev

* commit 'd6138017d9d435b176dff424ff75c8e8ea298d06':
  API changes per API review for contacts