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

* commit '51213d943b3931434cbd196a8a159ee325a4e3fc':
  Fix NPE in ConnectivityService