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

Change-Id: Ie79acf53b0cdb532f81d4e61e669bdb101b71c0a