Teach Control Node to handle change in VN index

Change-Id: I987431be6970ecba35485317648af2624b01ad53