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

Original change: undetermined

Change-Id: I4da6f49d89b8f23d08827462983e9b3c27b0fd4d