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

* commit 'a64f899fa6159a8839a769d3f107f6c502da58c8':
  Always show appropriate mobile service label.