Merge "Implement ConnectivityService TODO and fix many race conditions" am: f6b72dd145 am: 8bb2cdea00 am: 287c334379
am: dae21ba0a4

Change-Id: I1d4d3a75eb0e6cdfa348d8f877a5cdc5586b2551