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

Original change: undetermined

Change-Id: I0d62c7b3f50ae1ae7cae2ce088dd84fb239816af