Merge "diag: Enhance IPC logging for diag CNTL channel"