Merge "Clarify number format expectations for get/setPhoneNumber"