Merge "Verify tenant usages API response attributes"