Merge "Replace getPhoneCount with getMaxPhoneCount upon object allocation." am: c084de230e
am: b25b836f98

Change-Id: Ideeb9a4b879054d8d72caeb7c59ff558c0928204