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

* commit 'a8a448da25c62f54cac3318c17c69e851a4ecde9':
  Fix NPE in ConnectivityService
tree: f9995dab0c1193f9c2557cbe3b27ffadb4ec3dcc
  1. core/
  2. services/