am 6668bcdc: am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev am: 2b1ac58fdf

Original change: undetermined

Change-Id: Ie885a39b42ca2d5a2438f6ca705f911986de29af