Merge "Add dev options to set swXdp" into nyc-dev