am d49ad423: am b67f24eb: Merge "Clarify phone type magic constant naming." into mnc-dev

* commit 'd49ad423d033d49a3c61bf7fc527bffbe0db5e22':
  Clarify phone type magic constant naming.