Merge "Fix NullPointerException in ConnectivityService" am: 56dbf7cc45 am: d0e6636019
am: db275b40f2

Change-Id: Ifb398cef8fb51848b4c1cefa2ef1dfd6b6c01732