Merge "kernel: changes to enable tcpdump in sfe"