Merge "diag: Update diag logging mask for log codes"