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

Change-Id: I8ac5bbeb053af4e626980725c8216758c797e6ea