Merge "Rename waitForConnectivityBroadcast"