am 2c41bce3: am bc026d0a: Fix NPE in ConnectivityService. am: 28e752f026 am: 8016e0fd02

Original change: undetermined

Change-Id: I2fce483d33723b75b637ed9f118b6de55148d2a7