Merge "Use updated NetworkEventDispatcher API"