Merge "Contacts API clean-up (mostly documentation)"