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

* commit 'cd489c4ce59c134c384238cbb613ede34f28189c':
  Don't crash if there is no connectivity service.