Merge "Don't crash if there is no connectivity service." into ics-mr1