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

Change-Id: Ia59d45f4e95a536d7982f61ac9c9a1bfc5e8ebb8