Merge "bpf_map_def: undo incorrect comment change." into main