Merge "Initial implementation for hwvtepsouthbound"