am 18490abd: Merge "Fix NPE in ConnectivityService"

* commit '18490abd9bcb401f0d75a314056fb2a44dd61f07':
  Fix NPE in ConnectivityService