Merge "Add missing log parameters and fix the ordering." into udc-dev