Merge "Change the way of merging primary phone number" into pi-car-dev am: 7011119603 am: 283cff26f7 am: b92288e3c0

Change-Id: I899f27c3f7c08b1b3615b4c6d2816b04d6b15a97