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

Change-Id: Ia1b6e8002adf5f01a30ef4a715fb075c6347530b