Merge "Added implementation for VTI add/remove address"