Merge "Revert "Add vlan interface to the gateway""