Only use legacy_usage for legacy query

Also fix not including the consumer usage

Fixes: 141768149
Test: make
Change-Id: Id556573acd34271071a0a9d30e17655f1579a914
1 file changed