Adding better route updating logic

Change-Id: I57995ba1053caed7d288e45bf7e26619bcd79832