Merge "Add more APIs for managing VLANs"