Merge "Align dpdk model to underlay"