Merge "Add client UID in debug log"