Merge "Using AsyncChannel for wifi connectivity"