fix per-device CAL licensing

(cherry picked from commit d6d0d81d08df4ee697ed4e8eb81264e95e1355df)