Merge "Migrate away from AsyncChannel in NetworkAgent"