Merge "Sanitize system route types to TYPE_UNKNOWN for non-system providers" into main