Merge "Merge "Added implementation for VTI add/remove address" am: 2543fbd8a2 am: 9dda91f806" into pi-dev-plus-aosp
am: 7bec751fe6

Change-Id: I52bf3f1ae4739efe36641f06007adf3dd9ae9312