Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1