Good catch. GA added this after we came up with our solution. We are using custom Javascript code that uses Measurment Protocol to send data to GA.

EDIT: Client Id still needs to be generated for Google's Analytics.js. In my experience, the approach we took for that works quite well without using complicated browser foot-printing.