Merge "Service for diag_socket_log"