Merge "Added implementation for VTI add/remove address" into pi-dev
am: f801b8ae69  -s ours

Change-Id: I1f77872860e705606ba9f0c7f95200ee5bdbe499