am 18490abd: Merge "Fix NPE in ConnectivityService"

* commit '18490abd9bcb401f0d75a314056fb2a44dd61f07':
  Fix NPE in ConnectivityService
tree: 5cce6da6e73dcc6bfb75904e64cc5a51f552dbff
  1. core/
  2. services/