Merge "Stop complaining about failure to remove routes" am: aabfae0bc8

Original change: undetermined

Change-Id: I86f4fc65f6c124b8c92c274c315b108d19c24e89