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

Change-Id: I08d48a2280b9ff6bb4e417f2868c7dc31c3dfead