Merge "Refactor BpfNetMaps and getChainEnabled"