am f3cf7229: am 5e193896: Merge "Do not set type label if "Custom"." into mnc-dev

* commit 'f3cf7229bb2d6904c6c50a1d6de774d1da0c452b':
  Do not set type label if "Custom".