Merge "Catch correct exception for adding route fail" am: c2050ac731 am: 55c0f41695

Change-Id: Idd25323e01d87b81fd1021bcd0ea29a2468eedaa