Merge "Rename and publicize getMaxPhoneCount; and deprecate getPhoneCount."