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

Change-Id: I4a7658e1fa6946063ab86a251269413903841ee8