am 5f11ba57: am ff786de2: am 160bf5ee: am cfe1edfc: am 01b37680: Don\'t display "CUSTOM" when PHONE_TYPE == "CUSTOM" and no label set.

* commit '5f11ba57273df7d4837f623447d6dd75c7cf8959':
  Don't display "CUSTOM" when PHONE_TYPE == "CUSTOM" and no label set.