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