Merge "Add FIXME to deprecate all APIs that assume a route"