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

* commit '955b575dd94370f618f6b6424d60c1aa9dc34c14':
  Fix NPE in ConnectivityService