NBC: China and Japan end dispute over Fukushima water discharge