am 4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1

* commit '4d3161f379195302b720e120c5e6b65a0adfaf8c':
  Always show appropriate mobile service label.