Merge "Revert "NetBpfLoad: hacky way to make LPM_TRIE bpf maps work."" into main