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

Original change: undetermined

Change-Id: Idc934755ca67b3f4e813e4f6b8bf8c1ce4f41e99