Merge "dscpPolicy - remove bpf byteswap in favour of userspace"