Merge "api: work around Routes cutting off suffix from resource id"