Merge "Only use legacy_usage for legacy query"