am 6eddb39c: am 18490abd: Merge "Fix NPE in ConnectivityService"

* commit '6eddb39c857b178672218a345a276c4304e7ad37':
  Fix NPE in ConnectivityService