Merge "Remove primaryUserOnly param from UsageStats" into udc-qpr-dev