am b6344cef: am 48eded0e: am 18490abd: Merge "Fix NPE in ConnectivityService"

* commit 'b6344cefc4ebdcbb050681a569f2933704a00a77':
  Fix NPE in ConnectivityService
tree: 5091f04a68cba536749637a9f08814bbfa3b08d2
  1. core/
  2. services/