am 6668bcdc: am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev

* commit '6668bcdc88226c2f36f5ba4084661477e0e517c4':
  Fix NPE in ConnectivityService
tree: 7389617c2762cd27ff018ac0a2776de38ae759b8
  1. core/
  2. services/