Merge "change group permission of bpf maps"