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

* commit 'e568672c9e57e1d7066e95ba547a1ae568409226':
  Fix NPE in ConnectivityService